Drop gmapbase.html (embedded in gpsbabelfe)

diff --git a/debian/gpsbabel-gui.install b/debian/gpsbabel-gui.install
index 30392ad1b1dc2981b1785741cfd106a1f7b0853d..c093b335ae092ae71eecf2db0a632693405f1bbb 100644 (file)
--- a/debian/gpsbabel-gui.install
+++ b/debian/gpsbabel-gui.install
@@ -1,4 +1,3 @@
 gui/objects/gpsbabelfe /usr/bin
 debian/gpsbabel.xpm /usr/share/pixmaps
 gui/gpsbabel.desktop /usr/share/applications
-gui/gmapbase.html /usr/share/gpsbabel

diff --git a/debian/patches/gmapbase.html-location b/debian/patches/gmapbase.html-location
deleted file mode 100644 (file)
index b95918a..0000000
--- a/debian/patches/gmapbase.html-location
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gui/map.cc
-+++ b/gui/map.cc
-@@ -91,7 +91,7 @@ Map::Map(QWidget* parent,
-   // 1. In the file system in the same directory as the executable.
-   // 2. In the Qt resource system.  This is useful if the resource was compiled
-   //    into the executable.
--  QString baseFile =  QApplication::applicationDirPath() + "/gmapbase.html";
-+  QString baseFile =  "/usr/share/gpsbabel/gmapbase.html";
-   QString fileName;
-   QUrl baseUrl;
-   if (QFile(baseFile).exists()) {

diff --git a/debian/patches/series b/debian/patches/series
index 49b3f2c60829e157442999b7024a26c3fb341063..5cd9d3bfad93fefdb5af7526fd6f1453255dd8dd 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ gpsbabelfe_disable_version_check
 gpsbabelfe_opt-in-for-usage-data-reporting
 gpsbabelfe_do-not-check-for-newer-version
 htmldoc-location
-gmapbase.html-location
 Disable-donation-nagging
 0007-Add-workaround-for-failing-test-on-i386.patch
 0008-Add-Debian-build-flags.patch